button: Remove baseline_align value

It's unused.

diff --git a/gtk/gtkbuttonprivate.h b/gtk/gtkbuttonprivate.h
index a9e93e02d2fbf0c67350370b10c6940098ee6fb3..075f855012d55e22b22c960d0c39d5473face114 100644 (file)
--- a/gtk/gtkbuttonprivate.h
+++ b/gtk/gtkbuttonprivate.h
@@ -36,9 +36,6 @@ struct _GtkButtonPrivate
 
   GtkGesture            *gesture;
 
-  /* This is only used by checkbox and subclasses */
-  gfloat                 baseline_align;
-
   guint                  activate_timeout;
 
   guint          button_down           : 1;

diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 66f597befffdfdd4d27ddffe08ce18c9e1112c27..c0fd79304efc465ef336cf9018b1328528639a76 100644 (file)
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -415,8 +415,6 @@ gtk_check_button_size_allocate (GtkWidget     *widget,
   GtkButton *button = GTK_BUTTON (widget);
   GtkCssGadget *gadget;
   GdkRectangle clip;
-  PangoContext *pango_context;
-  PangoFontMetrics *metrics;
 
   if (priv->draw_indicator)
     gadget = priv->gadget;
@@ -431,15 +429,6 @@ gtk_check_button_size_allocate (GtkWidget     *widget,
 
   gtk_widget_set_clip (widget, &clip);
 
-  pango_context = gtk_widget_get_pango_context (widget);
-  metrics = pango_context_get_metrics (pango_context,
-                                       pango_context_get_font_description (pango_context),
-                                       pango_context_get_language (pango_context));
-  button->priv->baseline_align =
-      (double)pango_font_metrics_get_ascent (metrics) /
-      (pango_font_metrics_get_ascent (metrics) + pango_font_metrics_get_descent (metrics));
-  pango_font_metrics_unref (metrics);
-
   if (gtk_widget_get_realized (widget))
     {
       GtkAllocation border_allocation;

diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index baa568af736f0d75f0fae5810dd41f44e4010e1c..7c84725f889b206089c9909a8d6a98f8037ec1cb 100644 (file)
--- a/gtk/gtkmodelbutton.c
+++ b/gtk/gtkmodelbutton.c
@@ -807,8 +807,6 @@ gtk_model_button_allocate (GtkCssGadget        *gadget,
 {
   GtkWidget *widget;
   GtkModelButton *button;
-  PangoContext *pango_context;
-  PangoFontMetrics *metrics;
   GtkAllocation child_allocation;
   GtkWidget *child;
   gint check_min_width, check_nat_width;
@@ -874,16 +872,6 @@ gtk_model_button_allocate (GtkCssGadget        *gadget,
       gtk_widget_size_allocate_with_baseline (child, &child_allocation, baseline);
     }
 
-  pango_context = gtk_widget_get_pango_context (widget);
-  metrics = pango_context_get_metrics (pango_context,
-                                       pango_context_get_font_description (pango_context),
-                                       pango_context_get_language (pango_context));
-  GTK_BUTTON (button)->priv->baseline_align =
-    (double)pango_font_metrics_get_ascent (metrics) /
-    (pango_font_metrics_get_ascent (metrics) + pango_font_metrics_get_descent (metrics));
-  pango_font_metrics_unref (metrics);
-
-
   if (gtk_widget_get_realized (widget))
     {
       GtkAllocation border_allocation;